update model associations, add spec subfolders