restructured all the things