Reorder includes in index.php.  Resolves #554