Move to individual file setup from bulk library