Move classes around and create new package layout
Fix pipeline compilation