Directory structure changed.

Moved instrument related functions to a seperate fold. Measurement
scipts remains the same.