Reorganizing project so that there is only one module
Minor changes in the project structure