Starting to reorganize into a single project instead of a library.