Move lib into separate folder
Fix lib import