diff --git a/src/main/java/at/ac/uibk/commons/services/help/UibkConfluenceLinkSPI.java b/src/main/java/at/ac/uibk/commons/services/help/UibkConfluenceLinkSPI.java
index 2bd900291a367fa8c82730b6b6eb8732a8616938..f4c34a7c444a8d2e954b29129fa78760bbcf69ce 100644
--- a/src/main/java/at/ac/uibk/commons/services/help/UibkConfluenceLinkSPI.java
+++ b/src/main/java/at/ac/uibk/commons/services/help/UibkConfluenceLinkSPI.java
@@ -1,3 +1,23 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Code contributed and copyrighted by<br>
+ * University of Innsbruck, http://www.uibk.ac.at
+ * <p>
+ */
+
 package at.ac.uibk.commons.services.help;
 
 import java.util.Locale;
@@ -12,37 +32,43 @@ import org.olat.core.gui.control.WindowControl;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+/**
+ * Initial Date: Jul 18, 2016
+ *
+ * @author Daniel Haag
+ *
+ */
 @Service("uibkConfluenceLinkHelp")
 public class UibkConfluenceLinkSPI implements HelpLinkSPI {
 
 	public UibkConfluenceLinkSPI() {
 		super();
-		myConfluenceSpi = new MyConfluenceLinkSPI(); 
+		myConfluenceSpi = new MyConfluenceLinkSPI();
 	}
-	
+
 	@Value("${help.main.documentation.link:none}")
 	private String mainDocumentationLink;
 
 	private MyConfluenceLinkSPI myConfluenceSpi;
-	
+
 	private class MyConfluenceLinkSPI extends ConfluenceLinkSPI {
-		
+
 		@Override
 		public String getURL(Locale locale, String page) {
 			if(page == null || page.startsWith("Login Page")) {
 				return mainDocumentationLink;
 			} else {
 				return super.getURL(locale, page);
-			}	
+			}
 		}
 	}
-	
-	
+
+
 	@Override
 	public UserTool getHelpUserTool(WindowControl wControl) {
 		return myConfluenceSpi.getHelpUserTool(wControl);
 	}
-	
+
 	@Override
 	public String getURL(Locale locale, String page) {
 		return myConfluenceSpi.getURL(locale, page);
diff --git a/src/main/java/at/ac/uibk/course/CreateCourseContentCallback.java b/src/main/java/at/ac/uibk/course/CreateCourseContentCallback.java
index 938bf3f2715b0fb787a1a7b4c615928e2a05f904..9dac8e124c142029f7b096a2724e2d123ee394b8 100644
--- a/src/main/java/at/ac/uibk/course/CreateCourseContentCallback.java
+++ b/src/main/java/at/ac/uibk/course/CreateCourseContentCallback.java
@@ -1,3 +1,25 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Code originally based on de.bps.course.nodewizard.CopyStructureWizardFactoryImpl
+ * <p>
+ * Modified and adapted by<br>
+ * University of Innsbruck, http://www.uibk.ac.at
+ * <p>
+ */
+
 package at.ac.uibk.course;
 
 import java.util.ArrayList;
@@ -24,6 +46,12 @@ import de.bps.course.nodewizard.CopyStructureWizardFactoryImpl;
 import de.bps.course.nodewizard.WizardStepProcess;
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
 
+/**
+ * Initial Date: Jul 25, 2016
+ *
+ * @author Daniel Haag (based on code by @author bja)
+ *
+ */
 public class CreateCourseContentCallback implements StepRunnerCallback {
 
 	private static final OLog log = Tracing.createLoggerFor(CreateCourseContentCallback.class);
diff --git a/src/main/java/at/ac/uibk/course/CreateCourseContentStepForm.java b/src/main/java/at/ac/uibk/course/CreateCourseContentStepForm.java
index 066afac638c6df8abfaa4190d692cb30b32401d0..181fd936a6e7f0e355597a6daba5935944b88ade 100644
--- a/src/main/java/at/ac/uibk/course/CreateCourseContentStepForm.java
+++ b/src/main/java/at/ac/uibk/course/CreateCourseContentStepForm.java
@@ -1,3 +1,23 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Code contributed and copyrighted by<br>
+ * University of Innsbruck, http://www.uibk.ac.at
+ * <p>
+ */
+
 package at.ac.uibk.course;
 
 import java.util.Comparator;
@@ -37,6 +57,12 @@ import org.olat.repository.model.SearchRepositoryEntryParameters;
 import de.bps.course.nodewizard.WizardStepProcess;
 import de.bps.course.nodewizard.controller.CourseNodeSelectionTreeModel;
 
+/**
+ * Initial Date: Jul 8, 2016
+ *
+ * @author Daniel Haag
+ *
+ */
 class CreateCourseContentStepForm extends StepFormBasicController {
 
 	private Translator translator;
@@ -203,8 +229,8 @@ class CreateCourseContentStepForm extends StepFormBasicController {
 		uifactory.addSpacerElement("spacer1", formLayout, false);
 		final String[] checkCopyKeys = new String[] { "coursecontent.creation.checkbox.copy.all" };
 		final String[] checkCopyValues = new String[] { translate("coursecontent.creation.checkbox.copy.all") };
-		cbCopyAll = uifactory.addCheckboxesHorizontal("chkbxcopyall", "coursecontent.creation.checkbox.copy", formLayout, checkCopyKeys, checkCopyValues);		
+		cbCopyAll = uifactory.addCheckboxesHorizontal("chkbxcopyall", "coursecontent.creation.checkbox.copy", formLayout, checkCopyKeys, checkCopyValues);
 		cbCopyAll.setHelpTextKey("coursecontent.creation.checkbox.copy.descr", null);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/bps/course/nodewizard/CopyStructureWizardStepRunnerCallback.java b/src/main/java/de/bps/course/nodewizard/CopyStructureWizardStepRunnerCallback.java
index 79087939c560743dc67b8f1c89a9bac714f28205..673842e32151dc7b6f114b6e33b0624aa091378e 100644
--- a/src/main/java/de/bps/course/nodewizard/CopyStructureWizardStepRunnerCallback.java
+++ b/src/main/java/de/bps/course/nodewizard/CopyStructureWizardStepRunnerCallback.java
@@ -1,3 +1,25 @@
+/**
+ * OLAT - Online Learning and Training<br>
+ * http://www.olat.org
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Code originally based on de.bps.course.nodewizard.CopyStructureWizardFactoryImpl
+ * <p>
+ * Modified and adapted by<br>
+ * University of Innsbruck, http://www.uibk.ac.at
+ * <p>
+ */
 package de.bps.course.nodewizard;
 
 import org.olat.core.gui.UserRequest;
@@ -20,10 +42,22 @@ import org.olat.course.tree.CourseEditorTreeModel;
 
 import de.bps.course.nodewizard.coursenode.ICourseNodeCopyConfigurator;
 
+/**
+ *
+ * Description:<br>
+ * CopyStructure Wizard callback
+ *
+ * <P>
+ * based on code extracted from CopyStructureWizardFactoryImpl
+ * Initial Date: 16.12.2010 <br>
+ *
+ * @author Daniel Haag (based on code by @author bja)
+ *
+ */
 public class CopyStructureWizardStepRunnerCallback implements StepRunnerCallback {
 
 	private WizardStepProcess process;
-	
+
 	private CourseFragmentEnvironmentMapper courseFragmentEnvironmentMapper;
 
 	public CourseFragmentEnvironmentMapper getCourseFragmentEnvironmentMapper() {