Finally replaced App object structure.
More Comments!