Moving generic data structures under src/generic/