Updated WP Template Structure