Factoring out in APOD, Storage, Loader and Frontend