reworked the project into modular design.