Better layout of test resources.
Better layout of main resources.