prepared for new maven structure, refs #36