Added packages, reorg
Put a basic transition in.