change generator file structure