Re-factored files in repo