Reshuffled the package structure to follow best practices, from http://guide.python-distribute.org/creation.html