changed to one folder format