Revert "Revert "Moving files around to make code changes more modular from base BS12""

This reverts commit 79ff9683496a1e94b2b7cfff09234606d668b5ee.