Update application structure further