Refactoring Folder Setup