Merge (Network) with atom-core. The new package hierarchy will be handled different.