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

This reverts commit f0473c4abd99e66fd9f4225567f23ae89e354e2c.