Reorg of lib directory