grand application structure changes