Renaming and restructuring Modern Style agian.