Update directory structure to work with rustpkg