Renaming folders and refactoring