Reorganized files, new Makevars