Moved interfaces into the parent packages, and classes into their own packages.