Implemented the modular version
New modular structure files