moving all code into correct package-by-chapter