Changed my mind about splitting into subdirectories