Package refactor.
Table cell interface refactor.
Discipline Form work in progress.