Moved files to lib/
Added format option