code cleanup / comment
move gen files