Moved and renamed some things