* Make a common include directory for headers common to both stages
* Optimize the UEFI version of stage1
* Overall decluttering and reformatting