Renamed all the exceptions, moved them into a new directory
Merging conflicts and so on