fixing lib
refactor names
maven fix