Moved and renamed some files/methods