Sources reorganization