Shuffle more files around, now buildable with rustpkg!