Re-design the app's hierarchy