Application structure re-arranged