Release/bb refaktor projects - this actually fix not only projects

Do not merge yet...still problems