Cleanup
Made sense of polymorphism
Added 'points' input field
Cleanup
Makefile clean everything and don't show useless warning
Cleanup build.xml, fix deps