Extracted source files.
Extracted source files.
Merge branch 'enhancement/extract-source'