Re-factor files fro work