Change directory structure and removed extra layer.