Move some things around and update ignore files.