minor change: split files and fix an include guard typo