Massive cleanup / refactor. All but vanilla importing removed for now. Bumped to 1.7.0-dev1