Moved dynamic to a wrapping class

Placement in the directory structure might need changing.