Project Management merge
merging ProjectManager
fixed ProjectManagement merge to restructured architecture.