Moved to utils
Added JPAs
Effected by refactor to utils
New build files for refactor to utils