Change general structure to separate resource declarations