Started conversion to modular design