improve organization to files