Renamed a few packages and changed the locations of a few files. Also deleted deprecated files.