Reorganize sources a little