Attempt to re-organize packages