Changed Folder Structure

Changed folder structure to be conform to Spark Core