Added missing properties. Fixed order. Added missing namespace declarations.
Moved parent project to root.
Fixed module paths.