Next one set of changes. Resources are moved into specific folders.