Cleared up package layout.