Moved some files around to make publishing faster