refactored bo out of com into src