New organization for the files.
Fix bug.
Subspecs.