Changing directory structure to prep for official pip release.
Moving files to proper directories.