Final Version

Folders and files neatified! :D