Reorganize code to fit noids_client nameing scheme
Add rspec