cleanup, moved itemdatatypes to common directory