Final commit before make the project a submodule