Changes to directory/package structure, added Service and TestService classes.