Refactoring: Move files to apply Gradle structure