Refined Structure, added Service class.