Refactor of the project dtructure