Finish layout and routes
Removing public/index
Picking up changes