move less files, generalize make rules