Major folder name refactor