Restructured app into one file with includes