Rearranged directory structure for emacs 24