fixed package layout