Old Repository Structure Cleanup