CSP1150 A1: moved all classes to correct package, changed to version 5.1.0, removed unnecessary classes, fixed javadocs, comments
Merge branch 'rewrite'