Created separate signals/constants files. Updated BWM search.