Refactored dependency structure, added to team system