Move cmd files into subdir
Don't include timestamp in auto generated files