restructure, cleanup

shizzam