Started modifying to modular structure