Switch to a single-file organization