Reorganized folders

Synced github account with server and reorganized folders on github