removed and renamed some model files