Refactored startup classes.