Refactor into separate folder when necessary. Remove duplicate type definitions
Refactor into separate folder when necessary. Remove duplicate type definitions