Restructured;
Ready for RubyGem