Move files around to change package name.
Make the universe a singleton. Speed up XML loading.