Reorganize views folder