Cleaning up organization and moving EntryForm to forms.py