Update makefile.am for class reorganisation