moved scenes to data folder, code cleanup