NAWQAAN-289

* Moved basin layer creation to better place