Separate module source from core source