Renamed exceptions
Splitting file and cleanup complete