cpu: simplify folder structure

Closes #1273.