make new structure
remove old style