Restructure .js file structure
Create BaseModel with support for computed properties
Fix missing variable