Moved classes around
Added tests
Added Travis integration