Refactor to 1 deep resources