fixing route module and improve folder structure