Update and organize sources