Use Cases changed from single to multiple files