REVIEW: Move aether to core