tidying models from app/model to subdirs