Added some structure to the application. Making it all make sense.