Remove FABRIC_CAPI_DIR
Merge pull request #2 from fabric-engine/stage-reorg

Stage reorg