merge
o.files are moved to lib