CLEANING: Common files moved to common directory and unused files deleted.