refactored the folder format