major refactoring and restructuring of the project to help simplify the overall design.