Refactoring names and moved model files.