Reorganised internal structure
Test Storable instance, copy paste code from Internal