and start the process of moving the parsing code to one central file

Change-Id: If6d8def37ec8c8415c22d39f9d8b7a09ec423873