Moving stuff to server_modules to keep separation, consistent caps