modified application structure