Move way/generators to require