Split library into /lib and /bin
Added gemspec
Added templates
Fixed merge conflict