Source packages reorganization