Bugfix/imports and before i commit

This is a split up of ex setup.py branch.