Extracting modules for core and junit