diff --git a/Makefile b/assembler/Makefile
similarity index 100%
rename from Makefile
rename to assembler/Makefile
diff --git a/assembler/__init__.py b/assembler/assembler/__init__.py
similarity index 100%
rename from assembler/__init__.py
rename to assembler/assembler/__init__.py
diff --git a/assembler/assembler.py b/assembler/assembler/assembler.py
similarity index 100%
rename from assembler/assembler.py
rename to assembler/assembler/assembler.py
diff --git a/assembler/context.py b/assembler/assembler/context.py
similarity index 100%
rename from assembler/context.py
rename to assembler/assembler/context.py
diff --git a/assembler/directives.py b/assembler/assembler/directives.py
similarity index 100%
rename from assembler/directives.py
rename to assembler/assembler/directives.py
diff --git a/assembler/opcodes.py b/assembler/assembler/opcodes.py
similarity index 100%
rename from assembler/opcodes.py
rename to assembler/assembler/opcodes.py
diff --git a/assembler/tokenize.py b/assembler/assembler/tokenize.py
similarity index 100%
rename from assembler/tokenize.py
rename to assembler/assembler/tokenize.py
diff --git a/assembler/util.py b/assembler/assembler/util.py
similarity index 100%
rename from assembler/util.py
rename to assembler/assembler/util.py
diff --git a/test/conftest.py b/assembler/test/conftest.py
similarity index 100%
rename from test/conftest.py
rename to assembler/test/conftest.py
diff --git a/test/test_010_filecontext.py b/assembler/test/test_010_filecontext.py
similarity index 100%
rename from test/test_010_filecontext.py
rename to assembler/test/test_010_filecontext.py
diff --git a/test/test_011_tokenize.py b/assembler/test/test_011_tokenize.py
similarity index 100%
rename from test/test_011_tokenize.py
rename to assembler/test/test_011_tokenize.py
diff --git a/test/test_012_opcodes.py b/assembler/test/test_012_opcodes.py
similarity index 100%
rename from test/test_012_opcodes.py
rename to assembler/test/test_012_opcodes.py
diff --git a/test/test_013_util.py b/assembler/test/test_013_util.py
similarity index 100%
rename from test/test_013_util.py
rename to assembler/test/test_013_util.py
diff --git a/test/test_020_basic_parsing.py b/assembler/test/test_020_basic_parsing.py
similarity index 100%
rename from test/test_020_basic_parsing.py
rename to assembler/test/test_020_basic_parsing.py
diff --git a/test/test_021_parsing_failures.py b/assembler/test/test_021_parsing_failures.py
similarity index 100%
rename from test/test_021_parsing_failures.py
rename to assembler/test/test_021_parsing_failures.py