Changes to package structure to make imports play nice and make pypi installation work.