reorganize code in src (ours) & lib (theirs)