Update application
Update application structure further