Renamed some files and fixed include guards