Changed file structure

Removed a layer of folders