More additions, starting slimlining "files" into "source" to shorten
template length