restructure with resources 2