Update directory structure to rustpkg conventions