Further reorganize app