Remove old clases, change packages, addeed new controller and flows
Merge branch 'hardFactory' into develop