v3.0.2 - Moved layout and template to base package