Move form Model inside Form directory
Fix removeing items from collection