Reorganized Bootstrap entires for easier and more consistent system actor usage