now with passing tests

Also migrated all classes into cloud9 namespace