Modularised all scripts