refactoring
move manager to own file
refactoring