Changed routing and added multiple file support