refactor BSPAT project structure -- cont.