some simple renaming and restructuring