Re-structured theme / view folders