Rearrange routing and clean up files