(nearly) fully developed module supporting subfiles
Merge branch 'hotfix/1.0.0'