…into separate specialized source
The file organization is also messy and can change in the near future.
