Fixing the client side stuff to work with new module setup (still need to setup ivy.xml and build.xml)