added formTypes
sample tests
removed old dirs controllers and views