Move services from common dir to public dir