I don't feel like the separation ever made sense, and it was hard to tell which file a function you were looking for was in.