Minor improvements, code refactor, code cleaning.
----------------------------------------------------------
 - Better naming.
 - Maven 'package' now makes jar with dependencies aswell.
 - Fixes.
 - Better logging and logging messages.