#40 Code reorganization: Marked legacy classes as @deprecated