Added a bunch of files for org views, renamed a lot of other files for consistency