Updated model classes. Introduced storage package. Added tests for storage classes. Removed test package for now.