Swapped out hardcoded files for submodule