Tweaks
Move CLI on separate project
Update package