Changed folder structure in preparation for distutils installation.
Dependencies and imports consolidated.