Move random primitives to their own file
More code moving