Convert static methods into objects
Merge pull request #6 from yolo-test/refactor-into-classes

Convert static methods into objects