Updated application structure for testing