Better organization of files, removing extra html files and creating screen controller