updated the naming conventions for the application and modules to be consistent and logical