Naming convention simplified, code refactored, files renamed.