ProjectHierachy populates with project structure
Resolved more merge conflicts