moved things into structure easier to submit to pypi
moved files to inner directory