Organized Packages and Reran Tests

Signed-off-by: fisherjk <fisherjk@.uwec.edu>