add views folder and reorganize files