Moved server and client modules to root folder to fix module import errors