Move a few things about to make compiling with other projects possible.