rm Notifire and Router from core
refactoring Controller