Directory re-structuring.

Now that I have actually learned some decent python I decided to structure this
project with good style.
Merge branch 'restructure'