Cleanup! Because we don't need that ModelForm anymore
Moved forms to separate .py file
First pass on Announcement form