moved component types to separate bundle