Refactored and cleaned up the project. Using just one custom module for the project.