move views to separate files
deployed view refactoring
rebase branch on commit