Removed folders, added files

Folders were not needed