Moved beans into service package