Altered the whole structure - made it modular