Move Generic to main package