DAR-2106 | Move stuff around