Move lib files into a separate file