diff --git a/Others/PasswordGen.java b/Others/PasswordGen.java
new file mode 100644
index 00000000..12e67052
--- /dev/null
+++ b/Others/PasswordGen.java
@@ -0,0 +1,42 @@
+import java.util.Collections;
+import java.util.Random;
+import java.util.List;
+import java.util.ArrayList;
+
+/*
+    Creates a random password from ASCII letters
+    
+    author: AKS1996
+	date: 2017-10-22
+*/
+
+class PasswordGen {
+    public static void main(String args[]){
+        Random random = new Random();
+
+        String upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        String lower = "abcdefghijklmnopqrstuvwxyz";
+        String numbers = "0123456789";
+        String specialChars = "!@#$%^&*(){}?";
+
+        String allChars = upper+lower+numbers+specialChars;
+
+        List<Character> letters = new ArrayList<Character>();
+        for(char c:allChars.toCharArray())
+            letters.add(c);
+
+        // Inbuilt method to randomly shuffle a elements of a list
+        Collections.shuffle(letters);
+
+        int min_length = 8;
+        int max_length = 16;
+        String password = "";
+
+        // Note that size of the password is also random
+        for(int i = random.nextInt(max_length-min_length) + min_length; i>0; --i) {
+            password += letters.get(random.nextInt(letters.size()));
+        }
+
+        System.out.print("Password: " + password);
+    }
+}
diff --git a/Others/password_gen.java b/Others/password_gen.java
deleted file mode 100644
index 63e2a0ff..00000000
--- a/Others/password_gen.java
+++ /dev/null
@@ -1,39 +0,0 @@
-import java.util.Collections;
-import java.util.Random;
-import java.util.List;
-import java.util.ArrayList;
-/*
-	Creates a random password from ASCII letters
-	author: akshay sharma
-	date: 2017-10-17
-*/
-class password_gen {
-public static void main(String args[]){
-        Random random = new Random();
-        List<Character> letters = new ArrayList<>();
-        for(char c:"ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray())
-                letters.add(c);
-
-        for(char c:"ABCDEFGHIJKLMNOPQRSTUVWXYZ".toLowerCase().toCharArray())
-                letters.add(c);
-
-        for(char c:"0123456789".toCharArray())
-                letters.add(c);
-
-        for(char c:"!@#$%^&*(){}?".toCharArray())
-                letters.add(c);
-
-
-        Collections.shuffle(letters);
-
-        int min_length = 8;
-        int max_length = 16;
-        String password = "";
-
-        for(int i= random.nextInt(max_length-min_length) + min_length; i>0; --i) {
-                password += letters.get(random.nextInt(letters.size()));
-        }
-        System.out.print("Password: " + password);
-        System.out.print("[ If you are thinking of using this passsword, You better save it. ]");
-}
-}
diff --git a/Others/nested_brackets.java b/data_structures/Stacks/BalancedBrackets.java
similarity index 95%
rename from Others/nested_brackets.java
rename to data_structures/Stacks/BalancedBrackets.java
index 000dd88b..d0e9ef9c 100644
--- a/Others/nested_brackets.java
+++ b/data_structures/Stacks/BalancedBrackets.java
@@ -17,7 +17,7 @@ import java.util.Scanner;
 import java.util.Stack;
 import java.util.ArrayList;
 
-class nested_brackets {
+class BalancedBrackets {
 
     static boolean is_balanced(char[] S) {
         Stack<Character> stack = new Stack<>();
@@ -26,7 +26,6 @@ class nested_brackets {
             if (S[i] == '(' || S[i] == '{' || S[i] == '[') {
                 stack.push(S[i]);
             } else if (stack.size() > 0) {
-//                pair = (stack.lastElement() + S[i]);
                 if (!pair.equals("[]") && !pair.equals("()") && !pair.equals("{}")) {
                     return false;
                 }