Get rid of old baggage.

Simplified with removal of double abstraction
layer that were introduced when Timeline
was implemented outside of Nx codebase.
Removed merge remnant.

Double module declaration.