refactoring python hierarchy, __init__.py files don't quite work yet
deleted files put in different folders
Merge pull request #350 from mmcmahon13/master

refactoring python hierarchy