Rework client views folder structure