files reorganized to lib
more reorg