rework includes, modularize dependencies
update gemspec, few small fixes