Begin changing som header files to comply with new project format