Reorganized directory structure and naming conventions