Fix requires to isolate all files as mich as possible.

Fix requires to isolate all files as mich as possible. #14