Reorganized and got BP compiling