Reorganize lib files