Modularised scripts and reorganised views folder