Move no code files to extra folder.
Merge commit 'aceb1cf2b1e9853c7a92aec051b2163cfd0450eb'