Moving things into the correct Generators

Moving things into the correct Generators plus updating the ReadMe