Converted some files to proper Header/Source pairs