Changed the structure of the classes in a way that every service would be self contained.