Moving to package layout/format