stage reorg
Merge branch 'rivera' into stage-reorg
Remove license.txt from stage subdir
Directory reorg
Fixes for Windows
Merge pull request #2 from fabric-engine/stage-reorg

Stage reorg