Massive moving/renaming for consistency