correct classes namespace and folder structure
fix router behavior