Organizational improvements & DMA optimizations