Steps before moving all the stuff to Buildings library