#297 Move static file handlers