core(architecture): restructure App layout