Change structure and build into a gem
Add cli stuff