Rearranged directory structure for consistency