moved away from all legacy classes (com.github.etc) except for in the two of the module annotations