Update file structure, enhance forms.