More file structure, new form class, setup form.