Reorganized files

Moved folders/files to be in the root directory