Moved files to correct folder structure for sparkcore