Renamed the Main class to Application

Also cleaned it up