refactored views and add them into folder