Renaming some paths to make them consistent across the project.
Adding files after renaming paths.