Moved some files around and remove some more tabs.