Update application structure
Update broken