Implemented di container files for components
Improved coding style