Moving Factory to src