Restructure directories for rustpkg