moved things around to add into packagelist