Move files into a better package structure.