Cleaned up tests file/folder hierarchy.