Refactored folders and names