Restructued entire app