Restructure spec
Version 1.0.1 adds nice