Reorganized strutcture, naming convention