fix cad pic dimensions, simplify folder structure