Some route fixes, creating extra folders and organize