Restructured the Application and added few comments