Minor fixes in repo structuring