Reorganise files & extend Resources