Move more references into their own projects for binary package