Moving code around. Some renaming. No changes until we have some
documentation and a plan ;)