Finish layout and routes again, this time commiting from the right directory