more library organizing
more cleanup