Updating with refactored files