Mostly finished allowing .yml or .json files everywhere.