Refactored the managers to their own package