started to restructure the project into modules