Changed structure to work with rustpkg (hopefully)