core: removed factories, added forms & easier router