Code Quality: renaming files to make it more clear what they do