clean up generators specs and reorganized generators folder