Renaming, relocating, minor code changes