Moved things into static libraries.