Make all modules self contained