Moved generators into this project