Refs #11 : package layout, class renaming