Solution cleanup
Proper namespace naming
Fixed naming and dependencies