Ongoing work on Value.
Reorganized imports and files.