Switched back to a single file app as I disliked all the globals floating around.

If I find a way to change it back NICELY I will.