Created new package and moved prefix type there