Added atlas/nomad, reorganized