refactoring names of exception classes and includes in some classes