Change client side module structure to match the current structure of server side modules

The client side modules were initially structured with the design prototypes' structuring in mind. We have moved far away from the prototypes, yet our structuring of the client side remains the same. This makes placing new modules in the current structure a headache, and needs to be changed.