DataSet file tree reorganized
JS cleanup