changed package layout