Further refactoring of the steps code to used the module structure specified in the project guidelines