Restructuring code base for better readibility.