updated application structure