more cleanup work...
moved structure