Update application structure
Temporary commit