Shift around package layout based on http://guide.python-distribute.org/example.html?highlight=test