Reorg of dirs
Pipe creation... for Eclipse