[KFSQA-573] Reorganization
[KFSQA-573] Laid some basework for ADM. Sure hope nobody else ends up duplicating this stuff...