Cleaned up a lot, added Javadoc at many classes and methods.
Removed unnecessary tests