More source files into subdirs and hate on make