Reorganised files in lib and routes.