Major cleaning and re-organization of project folders