changed folder structure, got router working