reorg project per spark lib guidelines