Updated files and continued to refactor