Moved aggregators to their own package and more…

Changed exceptions thrown in client.