Add fixes to project structure