New design and code organization