Quick cleanup
Added model package support
Polish