reorganised structure of application