refactored management to seperate app