GPII-113: Renamed files according to Antranigs comment and fixed spacing next to binary operators