Refactors component server