[sunzi/development] multiple minor file moves/renames