Move Manager's o their own package