moving more components to server