Reorganized model classes into sub-packages of models

Signed-off-by: sjdodge123 <sjdodge123@github.com>