Folder structure modified

Organized the files a bit