Moves types into src