Moved some stuff about mainly the views into a new file