Another step towards modularization, moved forms and views into their own modules