more refactoring. abstactservice plugin moving
more rafactoring for improvements and clarity
make ut work
remove from ut
delete unecessary