Remove unneeded views and reorganize urls