File structure improvements

Split up some views over various files to keep our work a bit more structured