I don't actually see how it does make switching to AMD easier, and having 1 function per file is just going to make the code really really confusing.