Refactoring after review.
Architecture change: Separate Node modules from Client modules.