Reordering folders. Added test folder.