Move class files into includes directory.