Changed the package layout again