cleaned up and added better depenendency injection
extracted layout
added entry points and module
working random layout
modularized dependency injection
modulariation and cleanup
working with modularizatoin