Cleaning and re-organizing files