Migration, fix circular dependency, readded xib file that mysteriously dissapeared