Refactored main folder name