Updated files and continued refactoring