Improvements to the Client
Changed name of view package and moved files