Move modules to core code

simpl_unlinked & simpl_duplicates