removed double namespaces, more data structures, Trajectory and Bezier classes