Library moved
Command line script
Basic cleaned and updated