Rearranged files

Moved files to specific folders
fixed file locations

Oops.