[NUCCORE-1175] Refactor wrapper classes to more logical package names