Reorder code
Move depman library under lib/