Rewrite components to use factories, fix registration bug and remove useless services.