Team refactoring

Final merge to master