Trying to organize source files in a fashion that makes more sense