moved generators to appropriate place