fix version
create a models module
refactored storage into models