Add refactored packages.

Collections.<String>emptyList() can be of help?