Moving things around for ease of testing and building