updated models and refactored codes with includes folder