Deleted and renamed a few things. :-)