reorganised views folder