Move vendor directory and Fix some paths