fix core/router core/controllers