refactoring folder format to make it easier for maintenance.