Refactor structure to allow lazy loading without configuration
Merge pull request #3 from codemix/refactor-structure

Refactor structure to allow lazy loading without configuration