files structuring
Merge pull request #2081 from QuickFox/4.0-structuring

Files structuring