[WIP-03] Rename file to match Class name. Delete and re-add
[WIP-03] Re-add with name the same as class.