re-organization and some renamer work