rearranged some model files