Slight refactoring of the source tree