Add bootstrap templates
Structure, PSR2 fixes