renamed classes
renamed some model files