Expanded the application structure