Restructure spark directories