Commit 8

Moved everything to the main folder! :D