File renaming and positioning.
Merge branch 'canfar_dev'