split the project in submodules - there are issues still, but there was before too