Moved some of the views in different files