Base structure fixes, and base package.json