Renaming java files to not have OSGi suffix, some code cleanup