Structural cleanup.
Directory update.
Form element testing.