(cleanup) resolves merge conflicts
Merge pull request #45 from loqi/ngFileStruct

(cleanup) resolves merge conflicts