Refactor to change the root package to uk.org.mcdonnell.