routing fixes and removing wrong file