Some important refactoring on filestructure and usage
Some important refactoring on filestructure and usage