Separate displacement calculation in separate set of classes.
closes #121.