Fix requires to isolate all files as much as possible.

Fix requires to isolate all files as much as possible. #16