Refactored into world and test subdirectories.