mv src code around a bit