minor refactorings, simplified build process by using onejar plugin