Recreate project to fit with git structure