more cleanup and reorganization, trimming down files