generator: fix including files during non rhogen api calls
generator: set correct items ordering
generator: minor cleanup