Finally fixing the project dependencies without git submodules :)