Renamed rider to passenger
Removed unnecessary header
General Restructure of Files and namespaces