Add time range and data parameters. Move classes to separate files.