961 folder creation

fixes #961
Metrics/MethodLength: Method has too many lines. [12/10]