Moved struct location into base package.