removed dispatcher dependency and exchanged for core.
Changed api-calls to defaults, moved file-links in.