Update application structure and settings further