Moving values to attirbutes, and restructuring resources