* Move generator to a separate package. * Move loader to a separate package and get rid of the code duplications.