Moving Atom2 and model back into main repo - will branch entire sim repo if necessary