Reorganizing the project structure

The project structure was reorganized in order to favor junit tests..