item types files moved to separate sub-model folder
rename file name to match the others
architecture repaired to match the rest of the app