Client side code needs to be reorganised

Currently, the client side modules are a bit over-structured, with dirs being created when they don't need to be. This needs to be changed now, while not much of the client side code has been implemented.