Fixed Errors, modularized classes

Fixed issues: #20, #19 (switched to 2.1.0), #13, #2