Changes on the structure of the basic app