refactor of __File creation for default data
Merge branch 'development'
Bring HEAD to latest. See commits.