Update nhibernate collections
Project rearrange