Moved around more packages and started working on testing the database