Refactoring: Fix deprecation warning
Move built-in files out of source directory