Move/merge containments packages' /code subdirs below /ui subdirs

Authored by kossebau on Mar 8 2018, 11:34 PM.