Cleaned up folder structure*
This time properly