Pip

Structure reorg to match pip requirements.