master: moving the old stuff into the new repo