Changed some built in files

Refactoring did more than we knew