commit change for line item: 2 & 7

Convert terms / permission to checkbox
Move user uploaded files into subdirectories, subdirectory pattern:
{user id}/{content type machine name}