Moved main to Application and reduced references to Applicaiton