diff --git a/Cargo.toml b/Cargo.toml
index 18db562..755f852 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,9 +26,6 @@ keywords = [
 license = "Apache-2.0"
 repository = "https://github.com/gfx-rs/rspirv"
 
-[lib]
-path = "lib.rs"
-
 [dependencies.clippy]
 version = "0.0"
 optional = true
diff --git a/binary/assemble.rs b/src/binary/assemble.rs
similarity index 100%
rename from binary/assemble.rs
rename to src/binary/assemble.rs
diff --git a/binary/autogen_decode_operand.rs b/src/binary/autogen_decode_operand.rs
similarity index 100%
rename from binary/autogen_decode_operand.rs
rename to src/binary/autogen_decode_operand.rs
diff --git a/binary/autogen_disas_operand.rs b/src/binary/autogen_disas_operand.rs
similarity index 100%
rename from binary/autogen_disas_operand.rs
rename to src/binary/autogen_disas_operand.rs
diff --git a/binary/autogen_error.rs b/src/binary/autogen_error.rs
similarity index 100%
rename from binary/autogen_error.rs
rename to src/binary/autogen_error.rs
diff --git a/binary/autogen_parse_operand.rs b/src/binary/autogen_parse_operand.rs
similarity index 100%
rename from binary/autogen_parse_operand.rs
rename to src/binary/autogen_parse_operand.rs
diff --git a/binary/decoder.rs b/src/binary/decoder.rs
similarity index 100%
rename from binary/decoder.rs
rename to src/binary/decoder.rs
diff --git a/binary/disassemble.rs b/src/binary/disassemble.rs
similarity index 100%
rename from binary/disassemble.rs
rename to src/binary/disassemble.rs
diff --git a/binary/mod.rs b/src/binary/mod.rs
similarity index 100%
rename from binary/mod.rs
rename to src/binary/mod.rs
diff --git a/binary/parser.rs b/src/binary/parser.rs
similarity index 100%
rename from binary/parser.rs
rename to src/binary/parser.rs
diff --git a/binary/tracker.rs b/src/binary/tracker.rs
similarity index 100%
rename from binary/tracker.rs
rename to src/binary/tracker.rs
diff --git a/dr/autogen_operand.rs b/src/dr/autogen_operand.rs
similarity index 100%
rename from dr/autogen_operand.rs
rename to src/dr/autogen_operand.rs
diff --git a/dr/build/autogen_annotation.rs b/src/dr/build/autogen_annotation.rs
similarity index 100%
rename from dr/build/autogen_annotation.rs
rename to src/dr/build/autogen_annotation.rs
diff --git a/dr/build/autogen_constant.rs b/src/dr/build/autogen_constant.rs
similarity index 100%
rename from dr/build/autogen_constant.rs
rename to src/dr/build/autogen_constant.rs
diff --git a/dr/build/autogen_debug.rs b/src/dr/build/autogen_debug.rs
similarity index 100%
rename from dr/build/autogen_debug.rs
rename to src/dr/build/autogen_debug.rs
diff --git a/dr/build/autogen_norm_insts.rs b/src/dr/build/autogen_norm_insts.rs
similarity index 100%
rename from dr/build/autogen_norm_insts.rs
rename to src/dr/build/autogen_norm_insts.rs
diff --git a/dr/build/autogen_terminator.rs b/src/dr/build/autogen_terminator.rs
similarity index 100%
rename from dr/build/autogen_terminator.rs
rename to src/dr/build/autogen_terminator.rs
diff --git a/dr/build/autogen_type.rs b/src/dr/build/autogen_type.rs
similarity index 100%
rename from dr/build/autogen_type.rs
rename to src/dr/build/autogen_type.rs
diff --git a/dr/build/mod.rs b/src/dr/build/mod.rs
similarity index 100%
rename from dr/build/mod.rs
rename to src/dr/build/mod.rs
diff --git a/dr/constructs.rs b/src/dr/constructs.rs
similarity index 100%
rename from dr/constructs.rs
rename to src/dr/constructs.rs
diff --git a/dr/loader.rs b/src/dr/loader.rs
similarity index 100%
rename from dr/loader.rs
rename to src/dr/loader.rs
diff --git a/dr/mod.rs b/src/dr/mod.rs
similarity index 100%
rename from dr/mod.rs
rename to src/dr/mod.rs
diff --git a/grammar/autogen_glsl_std_450.rs b/src/grammar/autogen_glsl_std_450.rs
similarity index 100%
rename from grammar/autogen_glsl_std_450.rs
rename to src/grammar/autogen_glsl_std_450.rs
diff --git a/grammar/autogen_opencl_std_100.rs b/src/grammar/autogen_opencl_std_100.rs
similarity index 100%
rename from grammar/autogen_opencl_std_100.rs
rename to src/grammar/autogen_opencl_std_100.rs
diff --git a/grammar/autogen_table.rs b/src/grammar/autogen_table.rs
similarity index 100%
rename from grammar/autogen_table.rs
rename to src/grammar/autogen_table.rs
diff --git a/grammar/mod.rs b/src/grammar/mod.rs
similarity index 100%
rename from grammar/mod.rs
rename to src/grammar/mod.rs
diff --git a/grammar/reflect.rs b/src/grammar/reflect.rs
similarity index 100%
rename from grammar/reflect.rs
rename to src/grammar/reflect.rs
diff --git a/grammar/syntax.rs b/src/grammar/syntax.rs
similarity index 100%
rename from grammar/syntax.rs
rename to src/grammar/syntax.rs
diff --git a/lib.rs b/src/lib.rs
similarity index 100%
rename from lib.rs
rename to src/lib.rs
diff --git a/lift/autogen_context.rs b/src/lift/autogen_context.rs
similarity index 100%
rename from lift/autogen_context.rs
rename to src/lift/autogen_context.rs
diff --git a/lift/mod.rs b/src/lift/mod.rs
similarity index 100%
rename from lift/mod.rs
rename to src/lift/mod.rs
diff --git a/lift/storage.rs b/src/lift/storage.rs
similarity index 100%
rename from lift/storage.rs
rename to src/lift/storage.rs
diff --git a/sr/autogen_decoration.rs b/src/sr/autogen_decoration.rs
similarity index 100%
rename from sr/autogen_decoration.rs
rename to src/sr/autogen_decoration.rs
diff --git a/sr/autogen_instructions.rs b/src/sr/autogen_instructions.rs
similarity index 100%
rename from sr/autogen_instructions.rs
rename to src/sr/autogen_instructions.rs
diff --git a/sr/autogen_ops.rs b/src/sr/autogen_ops.rs
similarity index 100%
rename from sr/autogen_ops.rs
rename to src/sr/autogen_ops.rs
diff --git a/sr/autogen_types.rs b/src/sr/autogen_types.rs
similarity index 100%
rename from sr/autogen_types.rs
rename to src/sr/autogen_types.rs
diff --git a/sr/constants.rs b/src/sr/constants.rs
similarity index 100%
rename from sr/constants.rs
rename to src/sr/constants.rs
diff --git a/sr/mod.rs b/src/sr/mod.rs
similarity index 100%
rename from sr/mod.rs
rename to src/sr/mod.rs
diff --git a/sr/module.rs b/src/sr/module.rs
similarity index 100%
rename from sr/module.rs
rename to src/sr/module.rs
diff --git a/sr/storage.rs b/src/sr/storage.rs
similarity index 100%
rename from sr/storage.rs
rename to src/sr/storage.rs
diff --git a/sr/types.rs b/src/sr/types.rs
similarity index 100%
rename from sr/types.rs
rename to src/sr/types.rs
diff --git a/utils/mod.rs b/src/utils/mod.rs
similarity index 100%
rename from utils/mod.rs
rename to src/utils/mod.rs
diff --git a/utils/version.rs b/src/utils/version.rs
similarity index 100%
rename from utils/version.rs
rename to src/utils/version.rs
