refactored TrajData into its own file
clean up includes on main