Improving some aspects

Moving some files in the Project's architecture.
Commiting moved files.