changed file structure and updated for views