Minor project structure changes