diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534fb2..000000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerInitialPlacementTest.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java
similarity index 96%
rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerInitialPlacementTest.java
rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java
index 5b1ede489..2a78612ed 100644
--- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerInitialPlacementTest.java
+++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java
@@ -9,7 +9,7 @@
  *
  * @author Sareh Fotuhi Piraghaj
  */
-public class containerInitialPlacementTest {
+public class ContainerInitialPlacementTest {
 
 
     /**
@@ -31,7 +31,7 @@ public static void main(String[] args) throws IOException {
             /**
              * Getting the path of the planet lab workload that is included in the cloudSim Package
              */
-            String inputFolder = containerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath();
+            String inputFolder = ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath();
             /**
              * The output folder for the logs. The log files would be located in this folder.
              */
diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerOverbooking.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java
similarity index 96%
rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerOverbooking.java
rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java
index 57b342423..1602f73ff 100644
--- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerOverbooking.java
+++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java
@@ -9,7 +9,7 @@
  *
  * @author Sareh Fotuhi Piraghaj
  */
-public class containerOverbooking {
+public class ContainerOverbooking {
 
     /**
      * The main method.
@@ -30,7 +30,7 @@ public static void main(String[] args) throws IOException {
             /**
              * Getting the path of the planet lab workload that is included in the cloudSim Package
              */
-            String inputFolder = containerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath();
+            String inputFolder = ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath();
             /**
              * The output folder for the logs. The log files would be located in this folder.
              */
diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerSelectionTest.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java
similarity index 96%
rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerSelectionTest.java
rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java
index 1060e6f88..be9e636f8 100644
--- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/containerSelectionTest.java
+++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java
@@ -8,7 +8,7 @@
  *
  * @author Sareh Fotuhi Piraghaj
  */
-public class containerSelectionTest {
+public class ContainerSelectionTest {
 
 
     /**
@@ -30,7 +30,7 @@ public static void main(String[] args) throws IOException {
             /**
              * Getting the path of the planet lab workload that is included in the cloudSim Package
              */
-            String inputFolder = containerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath();
+            String inputFolder = ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath();
             /**
              * The output folder for the logs. The log files would be located in this folder.
              */