Removed some old files and reorganized the folder structure