Merge branch 'psf-restructuring' into 'master'
Structure functions restructuring
See merge request !12