Added base package structure