Rearranged the directory structure for efficient usage.