Next step in changing file name convention
More renaming
Even more renaming
Update readme