Cleanup, split the views in different files