Added a modular structure to the application
Added a modular structure to the application - v2