(Hope) last templating arrangements.

Also removed vehicles section.

...if it could be usefull, then will be added in the future.