Update html head templates
Re-factor theme layout by using custom includes
Refactor directory layout further