performed some refactoring although ProjectGenerator is still messy