Close reader in finally block
Refactor core.comm into its own bundle
Refactor core.cloud into its own bundle