restructure for ethereumj-core lib