Structured files better (src cat was getting a bit to big)