Removed the exception handling from clients, that was a stupid idea.
Also added packages to them.
Performed a Clean Up
Removed static imports