removed unused classes
Added models WIP