Code cleanup, rename, adding some dependencies.