Auto-format by Eclipse
temp
Adding some structure to the project
Finished restructuring the project. Previus funcionality has been
restored.