Clean and Reorganize Files (work in progress)