Reorganized Shiva code. Got commandline tool stubbed out. Eggified.