Complete overhaul of directory structure

Imports are also python 3 friendly