Updated routing and renamed files