Rearranged project directory structure