fix structure
adjust schema