Restructured components of the application