Re-estructured application