improved file structure and more flexible 'views' system