Merged Vehicle module into Transport

@flavour Please review :)