moving/renaming stuff cont'd