Move file around and fix imports accordingly