Changed structure to suit Spark web IDE