Move aether to core