moved generators to the correct package structure