restructure directories
Merge pull request #15 from CapillarySoftware/restructure

Restructure