Renaming some files and paths to match our proposed layout