Proper naming scheme

Because files should be where one expects them to be.