restructured forms

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'forms' into develop