Simplify lib directory structure.