To be consist with proper eager loading, this directory's
structure needed to be corrected. Yes, it looks weird but allows us to 
avoid rewriting anything.