Moved transport components and config to correct places