ref #6190 removing svn property place holder in first line of code - java files
Move Base operations test class to right package
Rename classes according to convention