Change the basic layout
Introduce new packages