Added Service Classes and reorganized Exceptions