Restructuring of the application for easier understanding.