moved the files to make the project includable as a submodule; modified some files to get fewer warnings at compile time