Add new views and break initial view into appropriate files