repackaged everything, cleaned up a bit