diff --git a/Applet in  java/java/README.md b/applet_in _java/java/README.md
similarity index 100%
rename from Applet in  java/java/README.md
rename to applet_in _java/java/README.md
diff --git a/Applet in  java/java/car.java b/applet_in _java/java/car.java
similarity index 100%
rename from Applet in  java/java/car.java
rename to applet_in _java/java/car.java
diff --git a/binary_search/binary.c b/binary_search/c/binary.c
similarity index 100%
rename from binary_search/binary.c
rename to binary_search/c/binary.c
diff --git a/binary_search/binarySearch.rb b/binary_search/ruby/binarySearch.rb
similarity index 100%
rename from binary_search/binarySearch.rb
rename to binary_search/ruby/binarySearch.rb
diff --git a/bit_operation/BitsQuestion.cpp b/bit_operation/cpp/BitsQuestion.cpp
similarity index 100%
rename from bit_operation/BitsQuestion.cpp
rename to bit_operation/cpp/BitsQuestion.cpp
diff --git a/check_ean_13/ean13.js b/check_ean_13/js/ean13.js
similarity index 100%
rename from check_ean_13/ean13.js
rename to check_ean_13/js/ean13.js
diff --git a/client_server/a.out b/client_server/a.out
deleted file mode 100755
index d4cc8a10f..000000000
Binary files a/client_server/a.out and /dev/null differ
diff --git a/client_server/client_side_chatting.c b/client_server/c/client_side_chatting.c
similarity index 100%
rename from client_server/client_side_chatting.c
rename to client_server/c/client_side_chatting.c
diff --git a/client_server/server_side_chatting.c b/client_server/c/server_side_chatting.c
similarity index 100%
rename from client_server/server_side_chatting.c
rename to client_server/c/server_side_chatting.c
diff --git a/client_server/client.py b/client_server/python/client.py
similarity index 100%
rename from client_server/client.py
rename to client_server/python/client.py
diff --git a/client_server/server.py b/client_server/python/server.py
similarity index 100%
rename from client_server/server.py
rename to client_server/python/server.py
diff --git a/companies_rank/empresa.py b/companies_rank/python/empresa.py
similarity index 100%
rename from companies_rank/empresa.py
rename to companies_rank/python/empresa.py
diff --git a/companies_rank/main.py b/companies_rank/python/main.py
similarity index 100%
rename from companies_rank/main.py
rename to companies_rank/python/main.py
diff --git a/companies_rank/puntuacion.py b/companies_rank/python/puntuacion.py
similarity index 100%
rename from companies_rank/puntuacion.py
rename to companies_rank/python/puntuacion.py
diff --git a/factorial/factorial.go b/factorial/factorial.go
deleted file mode 100644
index 842185cd5..000000000
--- a/factorial/factorial.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package main
-
-import "fmt"
-
-func fact(i int) int {
-
-    if(i == 1) {
-        return 1
-    } else {
-        return i * fact(i-1)
-    }
-}
-
-func main() {
-
-    var input int;
-    fmt.Scan(&input)
-    var output int = fact(input)
-    fmt.Print(output,"\n")
-}
diff --git a/factorial/python/factorial.py b/factorial/python/factorial.py
deleted file mode 100644
index 8d06be6b9..000000000
--- a/factorial/python/factorial.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-
-Script to generate Factorial in python 2.7 and 3
-
-"""
-
-result = [i for i in range(1000)]
-
-def fact_dp(n):
-    result[0] = 1
-    end = min(n, 1000) + 1
-    for i in range(1, end):
-        result[i] = i * result[i - 1]
-    
-    return result[n]
-
-if __name__ == '__main__':
-    
-    n = None
-    
-    try:
-        n = int(input("Enter a number :"))
-    except ValueError:
-        print("Not a number")
-
-    if (n <= 0):
-        print (1)
-    else:
-        print("Factorial : " + str(fact_dp(n)))
diff --git a/factorial/factorial.rb b/factorial/ruby/factorial.rb
similarity index 100%
rename from factorial/factorial.rb
rename to factorial/ruby/factorial.rb
diff --git a/factorial_dp/factorial.py b/factorial_dp/python/factorial.py
similarity index 100%
rename from factorial_dp/factorial.py
rename to factorial_dp/python/factorial.py
diff --git a/filter/filter.rkt b/filter/racket/filter.rkt
similarity index 100%
rename from filter/filter.rkt
rename to filter/racket/filter.rkt
diff --git a/final_age/app/__init__.py b/final_age/python/app/__init__.py
similarity index 100%
rename from final_age/app/__init__.py
rename to final_age/python/app/__init__.py
diff --git a/final_age/app/__init__.pyc b/final_age/python/app/__init__.pyc
similarity index 100%
rename from final_age/app/__init__.pyc
rename to final_age/python/app/__init__.pyc
diff --git a/final_age/app/admin.py b/final_age/python/app/admin.py
similarity index 100%
rename from final_age/app/admin.py
rename to final_age/python/app/admin.py
diff --git a/final_age/app/admin.pyc b/final_age/python/app/admin.pyc
similarity index 100%
rename from final_age/app/admin.pyc
rename to final_age/python/app/admin.pyc
diff --git a/final_age/app/apps.py b/final_age/python/app/apps.py
similarity index 100%
rename from final_age/app/apps.py
rename to final_age/python/app/apps.py
diff --git a/final_age/app/forms.py b/final_age/python/app/forms.py
similarity index 100%
rename from final_age/app/forms.py
rename to final_age/python/app/forms.py
diff --git a/final_age/app/forms.pyc b/final_age/python/app/forms.pyc
similarity index 100%
rename from final_age/app/forms.pyc
rename to final_age/python/app/forms.pyc
diff --git a/final_age/app/migrations/0001_initial.py b/final_age/python/app/migrations/0001_initial.py
similarity index 100%
rename from final_age/app/migrations/0001_initial.py
rename to final_age/python/app/migrations/0001_initial.py
diff --git a/final_age/app/migrations/0001_initial.pyc b/final_age/python/app/migrations/0001_initial.pyc
similarity index 100%
rename from final_age/app/migrations/0001_initial.pyc
rename to final_age/python/app/migrations/0001_initial.pyc
diff --git a/final_age/app/migrations/__init__.py b/final_age/python/app/migrations/__init__.py
similarity index 100%
rename from final_age/app/migrations/__init__.py
rename to final_age/python/app/migrations/__init__.py
diff --git a/final_age/app/migrations/__init__.pyc b/final_age/python/app/migrations/__init__.pyc
similarity index 100%
rename from final_age/app/migrations/__init__.pyc
rename to final_age/python/app/migrations/__init__.pyc
diff --git a/final_age/app/models.py b/final_age/python/app/models.py
similarity index 100%
rename from final_age/app/models.py
rename to final_age/python/app/models.py
diff --git a/final_age/app/models.pyc b/final_age/python/app/models.pyc
similarity index 100%
rename from final_age/app/models.pyc
rename to final_age/python/app/models.pyc
diff --git a/final_age/app/templates/add_birthdate.html b/final_age/python/app/templates/add_birthdate.html
similarity index 100%
rename from final_age/app/templates/add_birthdate.html
rename to final_age/python/app/templates/add_birthdate.html
diff --git a/final_age/app/templates/fun.html b/final_age/python/app/templates/fun.html
similarity index 100%
rename from final_age/app/templates/fun.html
rename to final_age/python/app/templates/fun.html
diff --git a/final_age/app/templates/index.html b/final_age/python/app/templates/index.html
similarity index 100%
rename from final_age/app/templates/index.html
rename to final_age/python/app/templates/index.html
diff --git a/final_age/app/tests.py b/final_age/python/app/tests.py
similarity index 100%
rename from final_age/app/tests.py
rename to final_age/python/app/tests.py
diff --git a/final_age/app/urls.py b/final_age/python/app/urls.py
similarity index 100%
rename from final_age/app/urls.py
rename to final_age/python/app/urls.py
diff --git a/final_age/app/urls.pyc b/final_age/python/app/urls.pyc
similarity index 100%
rename from final_age/app/urls.pyc
rename to final_age/python/app/urls.pyc
diff --git a/final_age/app/views.py b/final_age/python/app/views.py
similarity index 100%
rename from final_age/app/views.py
rename to final_age/python/app/views.py
diff --git a/final_age/app/views.pyc b/final_age/python/app/views.pyc
similarity index 100%
rename from final_age/app/views.pyc
rename to final_age/python/app/views.pyc
diff --git a/final_age/db.sqlite3 b/final_age/python/db.sqlite3
similarity index 100%
rename from final_age/db.sqlite3
rename to final_age/python/db.sqlite3
diff --git a/final_age/final_age/__init__.py b/final_age/python/final_age/__init__.py
similarity index 100%
rename from final_age/final_age/__init__.py
rename to final_age/python/final_age/__init__.py
diff --git a/final_age/final_age/__init__.pyc b/final_age/python/final_age/__init__.pyc
similarity index 100%
rename from final_age/final_age/__init__.pyc
rename to final_age/python/final_age/__init__.pyc
diff --git a/final_age/final_age/settings.py b/final_age/python/final_age/settings.py
similarity index 100%
rename from final_age/final_age/settings.py
rename to final_age/python/final_age/settings.py
diff --git a/final_age/final_age/settings.pyc b/final_age/python/final_age/settings.pyc
similarity index 100%
rename from final_age/final_age/settings.pyc
rename to final_age/python/final_age/settings.pyc
diff --git a/final_age/final_age/urls.py b/final_age/python/final_age/urls.py
similarity index 100%
rename from final_age/final_age/urls.py
rename to final_age/python/final_age/urls.py
diff --git a/final_age/final_age/urls.pyc b/final_age/python/final_age/urls.pyc
similarity index 100%
rename from final_age/final_age/urls.pyc
rename to final_age/python/final_age/urls.pyc
diff --git a/final_age/final_age/wsgi.py b/final_age/python/final_age/wsgi.py
similarity index 100%
rename from final_age/final_age/wsgi.py
rename to final_age/python/final_age/wsgi.py
diff --git a/final_age/final_age/wsgi.pyc b/final_age/python/final_age/wsgi.pyc
similarity index 100%
rename from final_age/final_age/wsgi.pyc
rename to final_age/python/final_age/wsgi.pyc
diff --git a/final_age/manage.py b/final_age/python/manage.py
similarity index 100%
rename from final_age/manage.py
rename to final_age/python/manage.py
diff --git a/functional_programming/index.js b/functional_programming/js/index.js
similarity index 100%
rename from functional_programming/index.js
rename to functional_programming/js/index.js
diff --git a/gcd/gcd.cs b/gcd/c#/gcd.cs
similarity index 100%
rename from gcd/gcd.cs
rename to gcd/c#/gcd.cs
diff --git a/gcd/gcd.c b/gcd/c/gcd.c
similarity index 100%
rename from gcd/gcd.c
rename to gcd/c/gcd.c
diff --git a/gcd/gcd.cpp b/gcd/cpp/gcd.cpp
similarity index 100%
rename from gcd/gcd.cpp
rename to gcd/cpp/gcd.cpp
diff --git a/gcd/gcd.java b/gcd/java/gcd.java
similarity index 100%
rename from gcd/gcd.java
rename to gcd/java/gcd.java
diff --git a/gcd/gcd.py b/gcd/python/gcd.py
similarity index 100%
rename from gcd/gcd.py
rename to gcd/python/gcd.py
diff --git a/githubAPI/exampleOutput.json b/githu-api/js/exampleOutput.json
similarity index 100%
rename from githubAPI/exampleOutput.json
rename to githu-api/js/exampleOutput.json
diff --git a/githubAPI/search.js b/githu-api/js/search.js
similarity index 100%
rename from githubAPI/search.js
rename to githu-api/js/search.js
diff --git a/Gradient Descent/data1.csv b/gradient-escent/python/data1.csv
similarity index 100%
rename from Gradient Descent/data1.csv
rename to gradient-escent/python/data1.csv
diff --git a/Gradient Descent/gradient.py b/gradient-escent/python/gradient.py
similarity index 100%
rename from Gradient Descent/gradient.py
rename to gradient-escent/python/gradient.py
diff --git a/graphs/graph_xkcd.py b/graphs/python/graph_xkcd.py
similarity index 100%
rename from graphs/graph_xkcd.py
rename to graphs/python/graph_xkcd.py
diff --git a/happy_hacktoberfest/main.c b/happy_hacktoberfest/c/main.c
similarity index 100%
rename from happy_hacktoberfest/main.c
rename to happy_hacktoberfest/c/main.c
diff --git a/happy_hacktoberfest/makefile b/happy_hacktoberfest/c/makefile
similarity index 100%
rename from happy_hacktoberfest/makefile
rename to happy_hacktoberfest/c/makefile
diff --git a/happy_hacktoberfest/readme b/happy_hacktoberfest/c/readme
similarity index 100%
rename from happy_hacktoberfest/readme
rename to happy_hacktoberfest/c/readme
diff --git a/happy_hacktoberfest/happy_hacktoberfest b/happy_hacktoberfest/happy_hacktoberfest
deleted file mode 100755
index 285a1da61..000000000
Binary files a/happy_hacktoberfest/happy_hacktoberfest and /dev/null differ
diff --git a/hello_world/HelloWorld.bf b/hello_world/brainfuck/HelloWorld.bf
similarity index 100%
rename from hello_world/HelloWorld.bf
rename to hello_world/brainfuck/HelloWorld.bf
diff --git a/hello_world/hello_world.ex b/hello_world/elixir/hello_world.ex
similarity index 100%
rename from hello_world/hello_world.ex
rename to hello_world/elixir/hello_world.ex
diff --git a/hello_world/hello_world.kt b/hello_world/kotlin/hello_world.kt
similarity index 100%
rename from hello_world/hello_world.kt
rename to hello_world/kotlin/hello_world.kt
diff --git a/hello_world/hello_world_kt2.kt b/hello_world/kotlin/hello_world_kt2.kt
similarity index 100%
rename from hello_world/hello_world_kt2.kt
rename to hello_world/kotlin/hello_world_kt2.kt
diff --git a/hello_world/hello_world.lisp b/hello_world/lisp/hello_world.lisp
similarity index 100%
rename from hello_world/hello_world.lisp
rename to hello_world/lisp/hello_world.lisp
diff --git a/hello_world/hello_world.m b/hello_world/matlab/hello_world.m
similarity index 100%
rename from hello_world/hello_world.m
rename to hello_world/matlab/hello_world.m
diff --git a/hello_world/hello_world.ml b/hello_world/ml/hello_world.ml
similarity index 100%
rename from hello_world/hello_world.ml
rename to hello_world/ml/hello_world.ml
diff --git a/hello_world/HelloWorld.purs b/hello_world/purescript/HelloWorld.purs
similarity index 100%
rename from hello_world/HelloWorld.purs
rename to hello_world/purescript/HelloWorld.purs
diff --git a/hello_world/hello_world.ts b/hello_world/typescript/hello_world.ts
similarity index 100%
rename from hello_world/hello_world.ts
rename to hello_world/typescript/hello_world.ts
diff --git a/is_palindrome/is_palindrome.java b/is_palindrome/java/is_palindrome.java
similarity index 100%
rename from is_palindrome/is_palindrome.java
rename to is_palindrome/java/is_palindrome.java
diff --git a/is_prime/sieve-prime.swift b/is_prime/swift/sieve-prime.swift
similarity index 100%
rename from is_prime/sieve-prime.swift
rename to is_prime/swift/sieve-prime.swift
diff --git a/loop/SPOJ_TEST.cpp b/loop/cpp/SPOJ_TEST.cpp
similarity index 100%
rename from loop/SPOJ_TEST.cpp
rename to loop/cpp/SPOJ_TEST.cpp
diff --git a/loop/sum_forLoop.go b/loop/go/sum_forLoop.go
similarity index 100%
rename from loop/sum_forLoop.go
rename to loop/go/sum_forLoop.go
diff --git a/loop/Factorial_forLoop.rb b/loop/ruby/Factorial_forLoop.rb
similarity index 100%
rename from loop/Factorial_forLoop.rb
rename to loop/ruby/Factorial_forLoop.rb
diff --git a/map/map.rkt b/map/racket/map.rkt
similarity index 100%
rename from map/map.rkt
rename to map/racket/map.rkt
diff --git a/multithreaded_dotproduct/multi_thread_dot_product.c b/multithreaded_dotproduct/c/multi_thread_dot_product.c
similarity index 100%
rename from multithreaded_dotproduct/multi_thread_dot_product.c
rename to multithreaded_dotproduct/c/multi_thread_dot_product.c
diff --git a/nlp/NLP_program.py b/nlp/python/NLP_program.py
similarity index 100%
rename from nlp/NLP_program.py
rename to nlp/python/NLP_program.py
diff --git a/nlp/named_entity_recognition.py b/nlp/python/named_entity_recognition.py
similarity index 100%
rename from nlp/named_entity_recognition.py
rename to nlp/python/named_entity_recognition.py
diff --git a/nlp/speech_tagging.py b/nlp/python/speech_tagging.py
similarity index 100%
rename from nlp/speech_tagging.py
rename to nlp/python/speech_tagging.py
diff --git a/nqueens/nqueens.c b/nqueens/c/nqueens.c
similarity index 100%
rename from nqueens/nqueens.c
rename to nqueens/c/nqueens.c
diff --git a/java_objects/Student.java b/objects/java/Student.java
similarity index 100%
rename from java_objects/Student.java
rename to objects/java/Student.java
diff --git a/odd_even/instructions.txt b/odd_even/cpp/instructions.txt
similarity index 100%
rename from odd_even/instructions.txt
rename to odd_even/cpp/instructions.txt
diff --git a/odd_even/odd_even.cpp b/odd_even/cpp/odd_even.cpp
similarity index 100%
rename from odd_even/odd_even.cpp
rename to odd_even/cpp/odd_even.cpp
diff --git a/password_generator/PasswordStrength.java b/password_generator/java/PasswordStrength.java
similarity index 100%
rename from password_generator/PasswordStrength.java
rename to password_generator/java/PasswordStrength.java
diff --git a/password_generator/password.py b/password_generator/python/password.py
similarity index 100%
rename from password_generator/password.py
rename to password_generator/python/password.py
diff --git a/password_generator/password_generator.py b/password_generator/python/password_generator.py
similarity index 100%
rename from password_generator/password_generator.py
rename to password_generator/python/password_generator.py
diff --git a/password_generator/pw_checker.py b/password_generator/python/pw_checker.py
similarity index 100%
rename from password_generator/pw_checker.py
rename to password_generator/python/pw_checker.py
diff --git a/polynomial_addition_linkedList/polyAdd.c b/polynomial_addition_linkedList/c/polyAdd.c
similarity index 100%
rename from polynomial_addition_linkedList/polyAdd.c
rename to polynomial_addition_linkedList/c/polyAdd.c
diff --git a/prime_number/prime_number.c b/prime_number/c/prime_number.c
similarity index 100%
rename from prime_number/prime_number.c
rename to prime_number/c/prime_number.c
diff --git a/prime_number/prime.cpp b/prime_number/cpp/prime.cpp
similarity index 100%
rename from prime_number/prime.cpp
rename to prime_number/cpp/prime.cpp
diff --git a/recursion/factorial.java b/recursion/java/factorial.java
similarity index 100%
rename from recursion/factorial.java
rename to recursion/java/factorial.java
diff --git a/reverse_a_number/ReverseNumber.scala b/reverse_a_number/scala/ReverseNumber.scala
similarity index 100%
rename from reverse_a_number/ReverseNumber.scala
rename to reverse_a_number/scala/ReverseNumber.scala
diff --git a/sorting/Heap_Sort.cpp b/sorting/heap_sort/Heap_Sort.cpp
similarity index 100%
rename from sorting/Heap_Sort.cpp
rename to sorting/heap_sort/Heap_Sort.cpp
diff --git a/tic-tac-toe/tic-tac-toe.c b/tic_tac_toe/c/tic-tac-toe.c
similarity index 100%
rename from tic-tac-toe/tic-tac-toe.c
rename to tic_tac_toe/c/tic-tac-toe.c
diff --git a/tic-tac-toe/tictactoe.cpp b/tic_tac_toe/cpp/tictactoe.cpp
similarity index 100%
rename from tic-tac-toe/tictactoe.cpp
rename to tic_tac_toe/cpp/tictactoe.cpp
diff --git a/tic-tac-toe/TicTacToe.java b/tic_tac_toe/java/TicTacToe.java
similarity index 100%
rename from tic-tac-toe/TicTacToe.java
rename to tic_tac_toe/java/TicTacToe.java
diff --git a/totient_function/totient_function.cpp b/totient_function/cpp/totient_function.cpp
similarity index 100%
rename from totient_function/totient_function.cpp
rename to totient_function/cpp/totient_function.cpp
diff --git a/yahtzee/Dice.class b/yahtzee/Dice.class
deleted file mode 100644
index 75c7b92c4..000000000
Binary files a/yahtzee/Dice.class and /dev/null differ
diff --git a/yahtzee/Input.class b/yahtzee/Input.class
deleted file mode 100644
index 65eba6765..000000000
Binary files a/yahtzee/Input.class and /dev/null differ
diff --git a/yahtzee/Random.class b/yahtzee/Random.class
deleted file mode 100644
index e074d6515..000000000
Binary files a/yahtzee/Random.class and /dev/null differ
diff --git a/yahtzee/RollDice.class b/yahtzee/RollDice.class
deleted file mode 100644
index 70bc5fe4d..000000000
Binary files a/yahtzee/RollDice.class and /dev/null differ
diff --git a/yahtzee/Score.class b/yahtzee/Score.class
deleted file mode 100644
index 4b6fccc8b..000000000
Binary files a/yahtzee/Score.class and /dev/null differ
diff --git a/yahtzee/Yahtzee.class b/yahtzee/Yahtzee.class
deleted file mode 100644
index fcf4b51a2..000000000
Binary files a/yahtzee/Yahtzee.class and /dev/null differ
diff --git a/yahtzee/Dice.java b/yahtzee/java/Dice.java
similarity index 100%
rename from yahtzee/Dice.java
rename to yahtzee/java/Dice.java
diff --git a/yahtzee/Input.java b/yahtzee/java/Input.java
similarity index 100%
rename from yahtzee/Input.java
rename to yahtzee/java/Input.java
diff --git a/yahtzee/README.md b/yahtzee/java/README.md
similarity index 100%
rename from yahtzee/README.md
rename to yahtzee/java/README.md
diff --git a/yahtzee/Random.java b/yahtzee/java/Random.java
similarity index 100%
rename from yahtzee/Random.java
rename to yahtzee/java/Random.java
diff --git a/yahtzee/RollDice.java b/yahtzee/java/RollDice.java
similarity index 100%
rename from yahtzee/RollDice.java
rename to yahtzee/java/RollDice.java
diff --git a/yahtzee/Score.java b/yahtzee/java/Score.java
similarity index 100%
rename from yahtzee/Score.java
rename to yahtzee/java/Score.java
diff --git a/yahtzee/Yahtzee.java b/yahtzee/java/Yahtzee.java
similarity index 100%
rename from yahtzee/Yahtzee.java
rename to yahtzee/java/Yahtzee.java