Avalon - move to date-version subfolder