Merge "move DEPRECATED features into their own DEPRECATED folder in prep for future deletion as these have moved to webservices"