refactore somes modules for the new router