Add app instance check
Move car related files to car folder