Package files looking correct now