Modified composer.setup
Moved OSWModelHelper to an external module
Moved things 
Added Dependency