Move file loading to add/module