Moved and renamed some files