Superficial change
Some restructuring of files. Remove dependency on timeseries