Remove old temp. file.
Move notation classes to new package.
Skeltons of new move type functionality.