Reorg into src & lib folders