Reorganize 'lib'