Improve work with requirements. Remove circular dependency and some "require rubygems"