Updating rake to use devoptics organization