finish name change
Move extra code to subdirectory