put generation and controller in package GA, modified classes
merged