take some simple architectural design
Merge some important code