Various fixes in the project names and structure