Rearranging and cleaning up everything. Also, removed Tup.