Fixed project structures being messed up