Clean up.  Remove api stubs for now
Add nested resources