Restructuring

Pep compatible now.
Using makefile and testing setup from @jacebrowning's python template.
Path inclusion issues are screwing up the tests.