Did some refactoring and separated the generators into a project

finished all generators