Move/Rename file; rework code into classes