Moved classes to generate jar and added parameters for costs measure