Move basic types into Types/ folder.