Cleaned up folder format.