Move lib to main module