Rename segment definition JSON files and cleanup code layout