Migration of functions from main to MacDisk, CoreStorage handling etc