Redid the folder structure
Redoing folder structure(again)
Final redo.
Merge pull request #2 from Syxes/master

Final redo(hopefully)