Cleaned up solution structure
Cosmetics
Tweaking the client model
Trying to make cleaner separation around client model