Fixed The Project Hierarchy