Splitted the app into sub-apps
Formatting