Created Models folder and refactored classes into it