Includes renaming files, updating build system, includes, include guards etc. (cherry picked from commit fa967ed1)