Fixing Controller, adding dispatcher and fixing Router