File name refactoring.

Started on measure component