Clean up and reorganizing folders