Moving to single jar solution ..