changed to spark directory structure