Move nds/ and gpsp/ to under source/.