Clean up, rename, and add dependencies