Merge pull request #116 from bruttenberg/DEV2.2

Updated BP with a lazy factored interface.
Updated source tree directory to better support SBT builds