Remove Include on the Router; Consistent Dir Structure in config