Change file location/names to match current Java project style.