Adds and rearrange helper classes.
Updates/Rearranges the service code to satisfy the latest web service updates.