Refactor directories and fabric function names
Merge branch 'master' into develop