Cleaned the folder and restructured files.