Beginning to restructure
Merge pull request #1 from calypsomatic/test1

Beginning to restructure