Moved AtomWrapper to separate file