Cleaning up from root relocation

Files from original root location remained, and are duplicates. Deleting
all of them has no negative effects.