Edited StructureManager
Restructured Project