Adding server components to main repo