Now the lib is moved automatically. Other fixes and renaming