Beginning move into modular format
Merge pull request #16 from msoucy/pythonsetup

Architecture reorganization