diff --git a/ares/cli b/ares/cli
new file mode 100755
index 0000000..4c81cdd
--- /dev/null
+++ b/ares/cli
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec irb -I./client/lib -rclient --simple-prompt --readline "$@"
diff --git a/ares/client/lib/client.rb b/ares/client/lib/client.rb
new file mode 100644
index 0000000..5b0be31
--- /dev/null
+++ b/ares/client/lib/client.rb
@@ -0,0 +1,12 @@
+require 'active_resource'
+require 'awesome_print'
+
+SITE = 'http://localhost:9282' unless defined?(SITE)
+
+class Person < ActiveResource::Base
+  self.site = SITE
+end
+
+class Family < ActiveResource::Base
+  self.site = SITE
+end
diff --git a/ares/person.rb b/ares/person.rb
deleted file mode 100644
index 252e345..0000000
--- a/ares/person.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'active_resource'
-require 'awesome_print'
-
-class Person < ActiveResource::Base
-  self.site = 'http://localhost:9282'
-end
-
-def main
-  Person.all.each do |person|
-    ap person
-  end
-end
-
-if $0 == __FILE__
-  main
-end
diff --git a/ares/serve b/ares/run-server
similarity index 83%
rename from ares/serve
rename to ares/run-server
index 16ffa51..4d50e98 100755
--- a/ares/serve
+++ b/ares/run-server
@@ -5,4 +5,5 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 cd $(dirname $(readlink -f $0))
+export PYTHONPATH="$PWD:$PYTHONPATH"
 exec aspen -w ./www -a '0.0.0.0:9282'
diff --git a/ares/server/__init__.py b/ares/server/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ares/person_model.py b/ares/server/person.py
similarity index 97%
rename from ares/person_model.py
rename to ares/server/person.py
index 8fe3285..f77642f 100644
--- a/ares/person_model.py
+++ b/ares/server/person.py
@@ -1,5 +1,4 @@
-
-class PersonModel(object):
+class Person(object):
     _people = [
         {
             'name': {
diff --git a/ares/www/people.json b/ares/www/people.json
index ed3983e..e88b982 100644
--- a/ares/www/people.json
+++ b/ares/www/people.json
@@ -1,8 +1,8 @@
 import json
-from person_model import PersonModel
+from server.person import Person
 from aspen import Response
 
-__people__ = PersonModel()
+__people__ = Person()
 
 
 
diff --git a/ares/www/people/%id.json b/ares/www/people/%id.json
index 89cd6e0..d4f13b3 100644
--- a/ares/www/people/%id.json
+++ b/ares/www/people/%id.json
@@ -1,5 +1,5 @@
-from person_model import PersonModel
-__people__ = PersonModel()
+from server.person import Person
+__people__ = Person()
 
 response.body = {'person': __people__.get(int(path['id']))}