rearrange file placement to make imports happy.