Moved some files and renamed some routes