Code files reorganized for a more logical location