Moving some files and changing include guards.