Cleaned project tree, splited service object in two objects