Reformatted Package Layout