move selves to separate files