Move files.
Work to make the fragment states working.
Cleanup.