m-labs
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,5 @@
 __pycache__
-build/*
-*.o
-*.d
-*.a
-*.elf
-*.bin
-*.fbi
-tools/flterm
-tools/byteswap
-software/include/generated/*.h
-software/include/generated/*.ld
-software/include/generated/*.mak
+*.pyc
+*.egg-info
 *.vcd
 outgoing
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
-[submodule "extcores/lm32/submodule"]
-	path = extcores/lm32/submodule
+[submodule "misoc/cores/lm32/verilog/submodule"]
+	path = misoc/cores/lm32/verilog/submodule
 	url = https://github.com/m-labs/lm32.git
-[submodule "extcores/mor1kx/submodule"]
-	path = extcores/mor1kx/submodule
-	url = https://github.com/openrisc/mor1kx.git
-[submodule "software/compiler-rt"]
-	path = software/compiler-rt
+[submodule "misoc/cores/mor1kx/verilog"]
+    path = misoc/cores/mor1kx/verilog
+    url = https://github.com/openrisc/mor1kx.git
+[submodule "misoc/software/compiler_rt"]
+	path = misoc/software/compiler_rt
 	url = http://llvm.org/git/compiler-rt.git
-[submodule "software/unwinder"]
-	path = software/unwinder
-	url = https://github.com/whitequark/libunwind
+[submodule "misoc/software/unwinder"]
+	path = misoc/software/unwinder
+	url = http://llvm.org/git/libunwind.git
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,36 @@
+language: python
+python:
+  - "3.5"
+
+env:
+  global:
+    - PATH=$HOME/miniconda/bin:$PATH
+
+before_install:
+  # Install Miniconda
+  - wget https://raw.githubusercontent.com/m-labs/artiq/master/.travis/get-anaconda.sh
+  - chmod +x get-anaconda.sh
+  - ./get-anaconda.sh
+  - source $HOME/miniconda/bin/activate py35
+  - conda install anaconda-client
+install:
+  # workaround for https://github.com/conda/conda-build/issues/466
+  - "mkdir -p /home/travis/miniconda/conda-bld/linux-64"
+  - "conda index /home/travis/miniconda/conda-bld/linux-64"
+  - "conda build --python 3.5 conda/misoc"
+  - "conda install $(conda build --output --python 3.5 conda/misoc)"
+script:
+  - true
+
+after_success:
+  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then anaconda login --hostname $(hostname) --username $binstar_login --password $binstar_password; fi
+  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then anaconda upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/noarch/misoc-*.tar.bz2; fi
+
+notifications:
+  email: false
+  irc:
+    channels:
+      - chat.freenode.net#m-labs
+    template:
+      - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
+      - "Build details : %{build_url}"
diff --git a/CONTRIBUTING.md → CONTRIBUTING.rst b/CONTRIBUTING.md → CONTRIBUTING.rst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,4 @@
+graft misoc/software
+graft misoc/cores/lm32/verilog
+graft misoc/cores/mor1kx/verilog
+include misoc/cores/mxcrg.v
diff --git a/README b/README
@@ -106,7 +106,7 @@ modules.
 
 9. Contribute a patch!
   Once you have experimented with stuff, please send your results back.
-  For more details on how to do so, you can see the CONTRIBUTING.md file.
+  For more details on how to do so, you can see the CONTRIBUTING.rst file.
 
 [> License
 ----------

diff --git a/build/.keep_me b/build/.keep_me
diff --git a/conda/misoc/bld.bat b/conda/misoc/bld.bat
@@ -0,0 +1 @@
+%PYTHON% setup.py install
diff --git a/conda/misoc/meta.yaml b/conda/misoc/meta.yaml
@@ -0,0 +1,26 @@
+package:
+  name: misoc
+  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
+
+source:
+  git_url: https://github.com/m-labs/misoc
+  git_tag: master
+
+build:
+  noarch_python: true
+  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
+  script: $PYTHON setup.py install
+
+requirements:
+  build:
+    - migen
+    - python
+  run:
+    - migen
+    - python
+
+about:
+  home: http://m-labs.hk/gateware.html
+  license: 3-clause BSD
+  summary: 'A high performance and small footprint SoC based on Migen'
diff --git a/crc.py b/crc.py
diff --git a/extcores/__init__.py b/extcores/__init__.py
diff --git a/extcores/mor1kx/submodule b/extcores/mor1kx/submodule
diff --git a/flash_extra.py b/flash_extra.py
diff --git a/make.py b/make.py
diff --git a/targets/__init__.py → misoc/__init__.py b/targets/__init__.py → misoc/__init__.py
diff --git a/misoclib/video/__init__.py → misoc/cores/__init__.py b/misoclib/video/__init__.py → misoc/cores/__init__.py