Refactored generators into it's own folder