more renaming and re-organizing