Folders refactored